Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: fix 'Duplicate entry' error when @@auto_increment_increment and @@auto_increment_offset is set (#52626) #52962

Merged
merged 4 commits into from
Nov 7, 2024
Merged

*: fix 'Duplicate entry' error when @@auto_increment_increment and @@auto_increment_offset is set (#52626) #52962

merged 4 commits into from
Nov 7, 2024

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #52626

What problem does this PR solve?

Issue Number: close #52622

Problem Summary:

What changed and how does it work?

  1. set auto_increment_offset to 1 if its value is greater than auto_increment_increment
  2. add more check to protect alloc.base from been change to a smaller value

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Follow the steps in the issue

  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@tiancaiamao @ti-chi-bot
This is an automated cherry-pick of pingcap#52626
72a4436 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Apr 28, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 28, 2024
Merged
13 tasks
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 28, 2024
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 30, 2024
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 8, 2024
@codecov Codecov
Copy link

codecov bot commented May 8, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-7.1@d1e3dee). Learn more about missing BASE report.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-7.1     #52962   +/-   ##
================================================
  Coverage               ?   75.5335%           
================================================
  Files                  ?       1212           
  Lines                  ?     400094           
  Branches               ?          0           
================================================
  Hits                   ?     302205           
  Misses                 ?      80236           
  Partials               ?      17653

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label May 11, 2024
GMHDBJD
GMHDBJD approved these changes Nov 6, 2024
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Nov 6, 2024
@ti-chi-bot ti-chi-bot bot added the lgtm label Nov 6, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Nov 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Defined2014, GMHDBJD

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [Defined2014,GMHDBJD]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 6, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Nov 6, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-11-06 06:43:50.409919468 +0000 UTC m=+1023343.249075006: ☑️ agreed by GMHDBJD.
  • 2024-11-06 06:45:10.021002254 +0000 UTC m=+1023422.860157785: ☑️ agreed by Defined2014.

@tiancaiamao
Copy link
Contributor

/retest

@tiancaiamao
Copy link
Contributor

/test unit-test

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Nov 7, 2024

@tiancaiamao: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

The following commands are available to trigger optional jobs:

  • /test pull-br-integration-test
  • /test pull-common-test
  • /test pull-e2e-test
  • /test pull-integration-common-test
  • /test pull-integration-copr-test
  • /test pull-integration-ddl-test
  • /test pull-integration-jdbc-test
  • /test pull-integration-mysql-test
  • /test pull-sqllogic-test
  • /test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

  • pingcap/tidb/release-7.1/ghpr_build
  • pingcap/tidb/release-7.1/ghpr_check
  • pingcap/tidb/release-7.1/ghpr_check2
  • pingcap/tidb/release-7.1/ghpr_mysql_test
  • pingcap/tidb/release-7.1/ghpr_unit_test

In response to this:

/test unit-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tiprow tiprow
Copy link

tiprow bot commented Nov 7, 2024

@tiancaiamao: No presubmit jobs available for pingcap/tidb@release-7.1

In response to this:

/test unit-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@tiancaiamao
Copy link
Contributor

/test unit-test

@tiprow tiprow
Copy link

tiprow bot commented Nov 7, 2024

@tiancaiamao: No presubmit jobs available for pingcap/tidb@release-7.1

In response to this:

/test unit-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ti-chi-bot ti-chi-bot bot merged commit db8f4c9 into pingcap:release-7.1 Nov 7, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@Defined2014 Defined2014 Defined2014 approved these changes

Assignees

@tiancaiamao tiancaiamao

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-chi-bot @tiancaiamao @Defined2014 @GMHDBJD